Merge with git://www.denx.de/git/u-boot.git
authorPeter Pearse <[email protected]>
Tue, 18 Sep 2007 10:12:58 +0000 (11:12 +0100)
committerPeter Pearse <[email protected]>
Tue, 18 Sep 2007 10:12:58 +0000 (11:12 +0100)

Trivial merge